From: Florian Müllner <fmuellner@gnome.org>
Date: Sun, 25 Aug 2019 07:39:04 +0000 (+0300)
Subject: tests: Don't initialize Clutter
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~827^2^2~23
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=8ac5be95d3587855f791543ba6f04c318b95e345;p=gnome-shell.git

tests: Don't initialize Clutter

Clutter's backend code depends on MetaBackend now, which makes it
impossible to initialize without resorting to private mutter API.

Luckily we only need Clutter for interactive tests which are broken
anyway, as Clutter.main() and friends were removed a while ago.

So for now, get at least unit tests working again by simply the
unnecessary Clutter initialization.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/691
---

diff --git a/src/run-js-test.c b/src/run-js-test.c
index 172ec179f..ba5e875e8 100644
--- a/src/run-js-test.c
+++ b/src/run-js-test.c
@@ -30,11 +30,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <clutter/x11/clutter-x11.h>
-#include <gdk/gdkx.h>
 #include <girepository.h>
 #include <gjs/gjs.h>
-#include <gtk/gtk.h>
 
 #include "shell-global.h"
 #include "shell-global-private.h"
@@ -59,17 +56,6 @@ main(int argc, char **argv)
   gsize len;
   int code;
 
-  gdk_set_allowed_backends("x11");
-
-  gtk_init (&argc, &argv);
-
-  clutter_x11_set_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
-
-  if (clutter_init (&argc, &argv) != CLUTTER_INIT_SUCCESS)
-    return 1;
-
-  gdk_x11_display_set_window_scale (gdk_display_get_default (), 1);
-
   context = g_option_context_new (NULL);
 
   /* pass unknown through to the JS script */